Merge pull request #531 from soby-mathew/sm/multicluster_fvp

author danh-arm <[email protected]>

Fri, 19 Feb 2016 18:21:34 +0000 (18:21 +0000)

committer danh-arm <[email protected]>

Fri, 19 Feb 2016 18:21:34 +0000 (18:21 +0000)
author danh-arm <[email protected]>
Fri, 19 Feb 2016 18:21:34 +0000 (18:21 +0000)
committer danh-arm <[email protected]>
Fri, 19 Feb 2016 18:21:34 +0000 (18:21 +0000)
diff --cc docs/user-guide.md
Simple merge
diff --cc include/plat/arm/common/arm_def.h
Simple merge
diff --cc plat/arm/board/fvp/include/platform_def.h
Simple merge
author	danh-arm <[email protected]>
	Fri, 19 Feb 2016 18:21:34 +0000 (18:21 +0000)
committer	danh-arm <[email protected]>
	Fri, 19 Feb 2016 18:21:34 +0000 (18:21 +0000)
		1	2
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/plat/arm/common/arm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/board/fvp/include/platform_def.h	patch \|	diff1 \|	diff2 \|	blob \| history